vulkan: Remove color from push constants

It's now handled by the color pipeline.

diff --git a/gsk/gskvulkanpushconstants.c b/gsk/gskvulkanpushconstants.c
index 485ec8b36cd73f401f9d4cc7803ca1a9226f0de7..2b119fc25d4b810bc91e8ab0f76d8c91c09bc0dc 100644 (file)
--- a/gsk/gskvulkanpushconstants.c
+++ b/gsk/gskvulkanpushconstants.c
@@ -8,10 +8,7 @@ void
 gsk_vulkan_push_constants_init (GskVulkanPushConstants  *constants,
                                 const graphene_matrix_t *mvp)
 {
-  GdkRGBA transparent = { 0, 0, 0, 0 };
-
   gsk_vulkan_push_constants_set_mvp (constants, mvp);
-  gsk_vulkan_push_constants_set_color (constants, &transparent);
 }
 
 void
@@ -39,16 +36,6 @@ gsk_vulkan_push_constants_multiply_mvp (GskVulkanPushConstants  *self,
   gsk_vulkan_push_constants_set_mvp (self, &new_mvp);
 }
 
-void
-gsk_vulkan_push_constants_set_color (GskVulkanPushConstants *self,
-                                     const GdkRGBA          *color)
-{
-  self->fragment.color[0] = pow (color->red, 2.2);
-  self->fragment.color[1] = pow (color->green, 2.2);
-  self->fragment.color[2] = pow (color->blue, 2.2);
-  self->fragment.color[3] = color->alpha;
-}
-
 void
 gsk_vulkan_push_constants_push_vertex (GskVulkanPushConstants *self,
                                        VkCommandBuffer         command_buffer,
@@ -62,6 +49,7 @@ gsk_vulkan_push_constants_push_vertex (GskVulkanPushConstants *self,
                       &self->vertex);
 }
 
+#if 0
 void
 gsk_vulkan_push_constants_push_fragment (GskVulkanPushConstants *self,
                                          VkCommandBuffer         command_buffer,
@@ -74,6 +62,7 @@ gsk_vulkan_push_constants_push_fragment (GskVulkanPushConstants *self,
                       sizeof (self->fragment),
                       &self->fragment);
 }
+#endif
 
 uint32_t
 gst_vulkan_push_constants_get_range_count (void)
@@ -89,11 +78,13 @@ gst_vulkan_push_constants_get_ranges (void)
           .stageFlags = VK_SHADER_STAGE_VERTEX_BIT,
           .offset = G_STRUCT_OFFSET (GskVulkanPushConstants, vertex),
           .size = sizeof (((GskVulkanPushConstants *) 0)->vertex)
+#if 0
       },
       {
           .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
           .offset = G_STRUCT_OFFSET (GskVulkanPushConstants, fragment),
           .size = sizeof (((GskVulkanPushConstants *) 0)->fragment)
+#endif
       }
   };
 

diff --git a/gsk/gskvulkanpushconstantsprivate.h b/gsk/gskvulkanpushconstantsprivate.h
index 37ac01f6ae481e1968763470d518f3f3bc47a9d8..6b8608551f33019e6a8c1ed9d9d54d1d9f27403e 100644 (file)
--- a/gsk/gskvulkanpushconstantsprivate.h
+++ b/gsk/gskvulkanpushconstantsprivate.h
@@ -13,9 +13,10 @@ struct _GskVulkanPushConstants
   struct {
     float mvp[16];
   } vertex;
+#if 0
   struct {
-    float color[4];
   } fragment;
+#endif
 };
 
 const VkPushConstantRange *
@@ -31,15 +32,10 @@ void                    gsk_vulkan_push_constants_set_mvp               (GskVulk
                                                                          const graphene_matrix_t        *mvp);
 void                    gsk_vulkan_push_constants_multiply_mvp          (GskVulkanPushConstants         *self,
                                                                          const graphene_matrix_t        *transform);
-void                    gsk_vulkan_push_constants_set_color             (GskVulkanPushConstants         *self,
-                                                                         const GdkRGBA                  *color);
 
 void                    gsk_vulkan_push_constants_push_vertex           (GskVulkanPushConstants         *self,
                                                                          VkCommandBuffer                 command_buffer,
                                                                          VkPipelineLayout                pipeline_layout);
-void                    gsk_vulkan_push_constants_push_fragment         (GskVulkanPushConstants         *self,
-                                                                         VkCommandBuffer                 command_buffer,
-                                                                         VkPipelineLayout                pipeline_layout);
 
 G_END_DECLS
 

diff --git a/gsk/gskvulkanrenderpass.c b/gsk/gskvulkanrenderpass.c
index fed4e7caeb442f94c26f6f4fe75cf30c0a193a42..2af91dc65cab47eba365d6a1c36b22b9bb0ced0d 100644 (file)
--- a/gsk/gskvulkanrenderpass.c
+++ b/gsk/gskvulkanrenderpass.c
@@ -21,8 +21,7 @@ typedef enum {
   GSK_VULKAN_OP_TEXTURE,
   GSK_VULKAN_OP_COLOR,
   /* GskVulkanOpPushConstants */
-  GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS,
-  GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS
+  GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS
 } GskVulkanOpType;
 
 struct _GskVulkanOpRender
@@ -117,11 +116,6 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
       break;
 
     case GSK_COLOR_NODE:
-      op.type = GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS;
-      gsk_vulkan_push_constants_init_copy (&op.constants.constants, constants);
-      gsk_vulkan_push_constants_set_color (&op.constants.constants, gsk_color_node_peek_color (node));
-      g_array_append_val (self->render_ops, op);
-
       op.type = GSK_VULKAN_OP_COLOR;
       op.render.pipeline = gsk_vulkan_render_get_pipeline (render, GSK_VULKAN_PIPELINE_COLOR);
       g_array_append_val (self->render_ops, op);
@@ -168,9 +162,6 @@ gsk_vulkan_render_pass_add (GskVulkanRenderPass     *self,
   gsk_vulkan_push_constants_init (&op.constants.constants, mvp);
   g_array_append_val (self->render_ops, op);
 
-  op.type = GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS;
-  g_array_append_val (self->render_ops, op);
-
   gsk_vulkan_render_pass_add_node (self, render, &op.constants.constants, node);
 }
 
@@ -250,7 +241,6 @@ gsk_vulkan_render_pass_upload (GskVulkanRenderPass  *self,
           g_assert_not_reached ();
         case GSK_VULKAN_OP_COLOR:
         case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
-        case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
           break;
         }
     }
@@ -285,7 +275,6 @@ gsk_vulkan_render_pass_count_vertex_data (GskVulkanRenderPass *self)
         default:
           g_assert_not_reached ();
         case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
-        case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
           continue;
         }
     }
@@ -342,7 +331,6 @@ gsk_vulkan_render_pass_collect_vertex_data (GskVulkanRenderPass *self,
         default:
           g_assert_not_reached ();
         case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
-        case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
           continue;
         }
 
@@ -375,7 +363,6 @@ gsk_vulkan_render_pass_reserve_descriptor_sets (GskVulkanRenderPass *self,
           g_assert_not_reached ();
         case GSK_VULKAN_OP_COLOR:
         case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
-        case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
           break;
         }
     }
@@ -462,12 +449,6 @@ gsk_vulkan_render_pass_draw (GskVulkanRenderPass     *self,
                                                  gsk_vulkan_pipeline_layout_get_pipeline_layout (layout));
           break;
 
-        case GSK_VULKAN_OP_PUSH_FRAGMENT_CONSTANTS:
-          gsk_vulkan_push_constants_push_fragment (&op->constants.constants,
-                                                   command_buffer, 
-                                                   gsk_vulkan_pipeline_layout_get_pipeline_layout (layout));
-          break;
-
         default:
           g_assert_not_reached ();
           break;